Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Recyclable clothing arbitrage test #10

Closed
wants to merge 103 commits into from

Conversation

whatston3
Copy link
Owner

Running arbitrage tests on recyclable changes.

chrome-cirrus and others added 22 commits October 18, 2024 11:37
* Fix up the Templar

* Replace generator with APUs, switch up recharger setup

* Add some firelocks (also to Watchdog)

* Moved waste vent

* Remove stray fan

* Add atmos fill helper markers

* Add a prisoner EVA suit, random mug in the cockpit, and some decals

* Add some NFSD insignia to the ship's exterior

* Fixups

* Locker Fixup

---------

Co-authored-by: Dvir <[email protected]>
Co-authored-by: Dvir <[email protected]>
* Fix up the NSF mini-shuttles

* Fixup

* Floors

* Replace ship gun

---------

Co-authored-by: Dvir <[email protected]>
Co-authored-by: Dvir <[email protected]>
* Update NSF Interceptor

* Replace sec signs with NFSD

* Modify atmos waste vent location for a cleaner look, remove dupe scrubber

* Update interceptor.yml

---------

Co-authored-by: Dvir <[email protected]>
Co-authored-by: Dvir <[email protected]>
* Modernize the Hospitaller a bunch.

* Rejig main bay seating/medical bed configuration, add a firelock for the cockpit

* Add some NFSD insignia to the ship's exterior

* Update hospitaller.yml

---------

Co-authored-by: Dvir <[email protected]>
Co-authored-by: Dvir <[email protected]>
* wall freezers

* construction

* clean up yml, more sprites

* small fixes

* Update storage.yml

---------

Co-authored-by: Dvir <[email protected]>
Co-authored-by: Dvir <[email protected]>
* Actual waste of my time making this PR yet again, holy shit

* Update CartridgeLoaderSystem.cs
Copy link

RSI Diff Bot; head commit 179d351 merging into c1de325
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_NF/Structures/Furniture/folding_table.rsi

State Old New Status
folding Added
folding_folded Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Structures/Machines/cauldron.rsi

State Old New Status
off-0 Added
off-1 Added
off-2 Added
off-3 Added
off-4 Added
off-5 Added
off-6 Added
off-7 Added
off-8 Added
on-1 Added
on-2 Added
on-3 Added
on-4 Added
on-5 Added
on-6 Added
on-7 Added
on-8 Added

Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi

State Old New Status
base Added
closed Added
food-0 Added
food-1 Added
food-2 Added
food-3 Added
food-4 Added
food-5 Added
food-6 Added
food-7 Added
food-8 Added
food-9 Added
locked Added
open Added
unlocked Added

Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi

State Old New Status
door-decal-l1-fire Added
door-decal-l2-rad Added
door-decal-l3-bio Added
door-decal-l4-expl Added

Resources/Textures/_NF/Structures/Wallmounts/paintings.rsi

State Old New Status
painting1 Added
painting2 Added

Resources/Textures/_NF/Structures/Wallmounts/paintings_directional.rsi

State Old New Status
painting_bat Added
painting_ghost Added
painting_pumpkin Added

@whatston3 whatston3 closed this Nov 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants